disable color shell tests for terminals that don't support color

Some terminals (e.g. running a shell inside Emacs's shell-mode) don't
support color, and running tests that assume the terminal supports color
don't work so well.  Instead, if color is expected, check the terminal
for whether it supports color or not, and act accordingly.

diff --git a/tests/shell.rs b/tests/shell.rs
index 4b03aa6f6367a6dc2e525c889ccb2d89a3663959..8dc0786fc3fd2cbf1178efdc439a68b00ca394e0 100644 (file)
--- a/tests/shell.rs
+++ b/tests/shell.rs
@@ -62,15 +62,19 @@ fn colored_shell() {
         shell.say("Hey Alex", color::RED).unwrap();
     });
     let buf = a.lock().unwrap().clone();
-    assert_that(&buf[..],
-                shell_writes(colored_output("Hey Alex\n",
-                                            color::RED).unwrap()));
+    let expected_output = if term.unwrap().supports_color() {
+        shell_writes(colored_output("Hey Alex\n", color::RED).unwrap())
+    } else {
+        shell_writes("Hey Alex\n")
+    };
+    assert_that(&buf[..], expected_output);
 }
 
 #[test]
 fn color_explicitly_enabled() {
     let term = TerminfoTerminal::new(Vec::new());
     if term.is_none() { return }
+    if !term.unwrap().supports_color() { return }
 
     let config = ShellConfig { color_config: Always, tty: false };
     let a = Arc::new(Mutex::new(Vec::new()));